From 9683360c574dff909d728cf55a1ed310a8bc60bb Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 20 Feb 2018 11:08:32 +0000 Subject: [PATCH] x86/hvm: Don't shadow the domain parameter in hvm_save_cpu_msrs() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit c/s d2f86bf604 which introduced "struct hvm_save_descriptor *d" accidentally ended up shadowing the "struct domain *d" function parameter. Rename the former to desc. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Wei Liu Acked-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 91bc3e8b27..5d3921051b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1338,7 +1338,7 @@ static int hvm_save_cpu_msrs(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { - struct hvm_save_descriptor *d = _p(&h->data[h->cur]); + struct hvm_save_descriptor *desc = _p(&h->data[h->cur]); struct hvm_msr *ctxt; unsigned int i; @@ -1386,7 +1386,7 @@ static int hvm_save_cpu_msrs(struct domain *d, hvm_domain_context_t *h) if ( ctxt->count ) { /* Rewrite length to indicate how much space we actually used. */ - d->length = HVM_CPU_MSR_SIZE(ctxt->count); + desc->length = HVM_CPU_MSR_SIZE(ctxt->count); h->cur += HVM_CPU_MSR_SIZE(ctxt->count); } else -- 2.30.2